Fixes, fixes everywhere...