HEAD catchup + minor fixes