Fixing some issues with version #