Some fixes to initial