#725 - Fix build errors