Start work on fixes