scalar fixes