Fix some probable bugs @ rendering