A few more headpin fixes for system tests