(APU) Small cleanups