Cleanup, minor fixes to initialization