Small fixes and cleanups in code.