Fix coding errors
Add build tag