Cleanup. Minor conversion fixes