Location widget fixes