 - Back-propagating some fixes, don't mind me
 - Back-propagating some fixes, don't mind me

hbirchtree/coffeecutie-imgui,hbirchtree/coffeecutie-imgui,hbirchtree/coffeecutie-imgui,hbirchtree/coffeecutie-imgui,hbirchtree/coffeecutie-imgui