Miscellanious refinements.