Some nits from @annevk