minor fixes to api, more needed
minor fixes to api, more needed

guardian/alerta,guardian/alerta,mrkeng/alerta,skob/alerta,skob/alerta,skob/alerta,0312birdzhang/alerta,mrkeng/alerta,0312birdzhang/alerta,guardian/alerta,0312birdzhang/alerta,skob/alerta,mrkeng/alerta,guardian/alerta,mrkeng/alerta