Made more general fixes