Daemon - Porting to Grizzly and Bug fixes