Moved TODOs to bugs - there was only one relevant left...