Fix clone form bugs