Fix two issues found by Yarn