Fixing some symptoms of the move over, functionality is still not fully tested.