Pull request fixes

Merging conficts and after remarks enhancments.