Bug, typo, and name collision fixes