Fixes and minor improvements

This is just a bunch of fixes (stuff broken with https://github.com/radargun/radargun/pull/127 ) and minor improvements. No new major functionality.