Bug fixes to 'swift' command invocation + logging