Hotfixes. Final version before texturing