[TASK] Small clean ups and bugfixes