Actually fixed a couple rendering problems!