More build adjustments
Further build improvements regarding new skuzzle-parent