Some more fixes for: https://github.com/Karl-Gustav/autoActive/pull/4