(MAC) Fix some errors.