Fix incorrect versions

Still doesn't completely compile... needs more work