Fixes. Fixes everywhere!
MOAR fixes