Fixes for pac