Fix various LAOHP bugs, see JIRA for more info