Fixes from the merge