Fixes following comments