Merge "fix formatting errors to help debugging"