Fixes, everywhere