Misc work
Hopefully fixed more troubles with celery