Fixed resume, routing bugs