Fixes complete