Fixes, fixes and fixes.