Fixes for presentation