Final fix for xsp build.