Fix More Stupidity