Fixes for Shit Work