Add better header
fixes for b2g