api and nofifier fixes