A few changes

A few small changes