Couple of build fixes

Just a couple of random build fixes I came across.