Session manager fixups for derived charging