Multiple fixes

Proposed changes after updated testing with a custom product based on Autotest