Stupid Fixes