Fixes following review