Minor fixes for initial commit