Some tweaks before OGRE subsystem implementation