Fixing some outstanding issues with temp.