Fix for a few missed merges