workloadfix + logic number ordering

Signed-off-by: Per Hallsmark <per.hallsmark@windriver.com>