Minor changes (needed for future MAEC 4.0 support)