Fixed an unused variable warning, in a rather lame way.
Killed off a couple of warnings
Merge branch 'master' into prefix