Pulled fixed modules from master branch