Minor visual_generator bugfixes