Fixes for phone version