Fix up a couple minor APC mapping issues