Fixing the xpkg task compile errors - relates to issue #107