Fixes following Tim's review