Changes to original pull request

Some fixes for original pull request https://github.com/jbosstools/jbosstools-central/pull/81