Fix mem leak by limiting obj number in queues
Minor modifications