Fixes for new PA build