Last fixes for presentation