A few small changes to clean things up