Fixes and compatibility