Cleaning up misc changes