Bug fixes and compatibility
Bug fixes and compatibility