Fix Errors one by one
Rel.: #37