Fixed some glitches through usage