Cowry cleanups fixes