Fixes for Console redesign