SPD-2 Commit to fix minor issues (13) that break build