Correct some frontend bugs