Some fixes and methods for support