Phase 2 of Bay Mobile pAI Port

Ports bugfixes from Baystation 12 for the issues that the initial mobile
pAI changes caused.
Forgot to compile before committing changes, fixed.