Fix more bugs in presentation