Logging cleanup + Scheme fixes