Additional fixes following merge