Minor changes, added todos for missing fixes