Fixed rendering problems