Small fixes for FTP