small syntax updates in preparation for new core