Fixes in response to Mark's review