TODOs and fixes