fix up some version handling issues