refs #7428 Changes to make the code a bit more usable

but just a bit