fix 2 broken builds