Cleaned up more problems with render