small fixes from scrutinizer analysis
Merge branch 'master' of github.com:ssola/enabler