Fixed numerous remaining issues with the 1.7.10 conversion