Merge pull request #175 from ElementalAlchemist/last-minute-patches

Last minute patches, part 4