[TASK] Various fixes and adjustments