Merge in various changes