Fixes, Reverting to originals.