Fixes for the final presentation