Fixes and scp integration