Fixed some issues (Need to readd OSUtil derpity derp...)