Fixes to Initialization