[3.8.6] Fix some minor bugs

PHRAS-134; PHRAS-130; PHRAS-133; PHRAS-128; PHRAS-108