Small improvements to dynamo generator