Fixes for pac

It's not possible to build pac with your latest commits.
I hope this pull request will fix it.