fixed pp5 compilation errors resulting from #24