A couple small fixes from 2.0 before I actually release 2.0