Build fixes from Roger