Finally fix the new line issue
Fixed build issues