fix issues with 1.0.1 version and pass lint validation