Minor global fixes