Fix minor issues...