Added mobile carrier fixes