Fix bugs with new Rending