fixes in APU abstractions