Some fixes for final presentation