Develop - fixes to restore building