Fixed some minor bags. Build scceeded.