App no custom vendors fix
Client listeners fix