Small fixes (TODO, Casting)