More cylinder generator bugfixes