Small fixes to the support code