Fixes for Wakanda 9