Erectin' a dispenser!

Hand fixes I needed to do to get my repo working again. I think eclipses
git plugin is buggy.