Fixes for loading queued items