Fix various priority level 1 issues