some minimal fixes cos of reuqest scopes...