Fixed queue issues + package update