Fixes, fixes and fixes