Fixed some awkward features