Various minor implementation changes