Few fixes and TODOs