Merging Bay master fixes

What is says on the tin.