Fixing some errors in the final rendering