Merge "misc fix"