fixes for glassfish