Made more fixes