Tweaks after code review from @yguedidi