#737 Small fixes: removed some TODOs