additional ovation/hummingbird fixes for carbon