Temp Fixes