Fixes for 1.6 ... way to go new resource system >.>