Minor make changes