Beta 5 fixes

@jamesduffy you know what to do...get this into release and out to the world.