Last fixes after FTP mistake