Fixed here and there