Fix solution and package references