Minor Issue fixes