Adding fixes and TODOs