Resolve misc TODOs

[jhassine]

This is a placeholder issue for linking misc TODOs from code that does not deserve it's own issue like not being a major shortcoming or a missing feature.

NOTE: Do not close this issue until all misc TODOs are resolved.