Fixes and compatibility updates