More POD fixes