Fixed calc and coen AP score cases