Adding back some fixes