diff --git a/main/autoservice.c b/main/autoservice.c
index fe4e2a7058..140103dba0 100644
--- a/main/autoservice.c
+++ b/main/autoservice.c
@@ -50,7 +50,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 db08c03e5f..07669692fc 100644
--- a/main/utils.c
+++ b/main/utils.c
@@ -511,7 +511,7 @@ const char *ast_inet_ntoa(struct in_addr ia)
 #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