Fix issues with getting MCA IDs