Version/name fixes