Made a few straggling fixes