Add stability markers
Fix latest deprecations