Further fixes for log message syntax errors

See #13