Fixes from merthyr merge after testing