Fix some more builds