Fixes for commit 01281eabd3.
Update scontrol man page.
Fix compilation problems and style issues.