Fixed some bugs before passing to natty