Trigger Henry: Small BugFix Patch

Eyo this patch fixes some small problems i encountered :)