Fix minor issues due to release repackaging.