Trying out more optimisations and fixed a compatibility bug with crossbow renderer