A few minor fixes to the SAPT class