Fixed build errors and language consistency