Working on fixes