Made some updates to remove terminal errors