More Various Fixes.
They didn't work anyway.