Fixes and TODO