Fixes for scp plugin