Fixed some aula bugs