Fixed some more nasty bugs