diff --git a/main/autoservice.c b/main/autoservice.c
index 02aa713a49673ad7b2f11ad0bdf4cbd4e0890611..fcc42911f7366c1239ee46bf166c73453fd6a3ba 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -43,7 +43,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #include "asterisk/lock.h"
 #include "asterisk/utils.h"
 
-#define MAX_AUTOMONS 256
+#define MAX_AUTOMONS 1500
 
 struct asent {
 	struct ast_channel *chan;
diff --git a/main/utils.c b/main/utils.c
index 6920141b0df2f7ddde146286db9200a52dcad742..bf0a7b2ad4ae02db9723dba4fa87928e649a663e 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -510,7 +510,7 @@ static int dev_urandom_fd;
 #ifdef DEBUG_THREADS
 
 /*! \brief A reasonable maximum number of locks a thread would be holding ... */
-#define AST_MAX_LOCKS 32
+#define AST_MAX_LOCKS 64
 
 /* Allow direct use of pthread_mutex_t and friends */
 #undef pthread_mutex_t