Fix some things which had been broken with code standards were applied.