Fixes, fixes everywhere