AKLP fixes