Fix compile error and nick rumbering.