Build fixes caused by update to latest version