Fixes for heading