more global fixes