Additional updates to Queue

See commit messages for details