Further fixes clean errors