Work/some fixes