A few small fix ups