Some fixes, bug with queue memory TO FIND