updated to comply with recent Core changes
cosmetic changes