Fixes for make scp