More fixes and explicit pak loading