Fix all render issues. 1.7 is now officially more stable than 1.6 (but not stable enough)