Fixed some more problems