Fixes following merge