Fix habanero refs and cleanup warnings