Fix notifer and logging