Some cleanups etc