More fixes for the upgrade. Need to get these better organized like my other projects.