Quick fixes + small changes