Pull-request fixes after remarks