varied fixes