Reduce bugs related to AREL API expectations