Fixed model.error test
Fixed hint errors
Update Makefile (CommonMakefiles changes)