Fix some standards