Fix a couple of oversights preventing mobile platforms from building