Small fixes in response to reviews