Further hdpi improvements