SCP: Fix various missing log output
Merge remote-tracking branch 'simh/master'