Render order related bugfixes