Fixed some bugs that prevented compilation