Fix mistakes and update short array syntax.