misc smaller fixes