Fixes for rendering and movement