Small changes to accomodate changes in CHARMM