Fixed some issues with to many versions being created etc.