Fixes for mobile registration