bugfixes to queue execution