Simplify configuration and fixed minor issues