Fixes for initialization changes