Versions bug fixes, minor performance changes