Build fixes from todays commits