Fixed some more bugs