Fixes for wakanda 9