fixes needed by quickstarts to run with javaee 7.0