Run through fixes

These fixes help to run the code though with the latest MySQL merging in some of the recent master fixes. Otherwise, other run through issues for automated_install.sh fixed.