Fixing daemon control