Clean up a handful of ruby warnings
Loads more cleanup