Bug fixes and cleanup compatibility with coder