Fixes, fixes everywhere!