Some fixes regarding the pull request

Fixes for Gabu remarks about what I did.