Fixed some sloppiness