fixes to get code loaded