daemon tasks fixes