LBS issue fixes