Fix compilation, add Stack/Queue