some HIG fixes