Fix #4 #5 #6

Sorry these are all in a chain.  If we want to break them back up, I can.