Fix some issues with my dynamo