Queue interval handler & some fixes