Merge pull request #354 from adamretter/develop

Fix some modules and Collection Triggers