Slp set/auto fix

Proposed changes. Please, review each one for validity.