Some cleanups with @barak007