fixes for liferay 6.0