Bug fixes

Two small bug fixes, that should reduce the number of vertices that are
being saved and drawn.