Merge from other ftp, small changes