Some render fixes and other stuff