Fixup indent rules
Attempt to trigger more warnings
Extend slave handler