Small Build Patch changes