Fixes as picked up by code review