Fixes from @gehan's feedback.