Fixed some bugs during install