fix upgrade and versioning for 3.6.3