Fixes for heads up«