Fixed build issue and a typo