minor future fixes