Fixing somethings