A few small tested changes