Fix minor build errors