Add changes from feedback by Adrian S.