Fix issues uncovered by theme-check