Minor changes and CeleryHeartbeat command