fix pod errors in master

There are lots of pod errors in the branches and in other repositories, too...