Fixing here and there