Fix small setupdata loader issues

issue #894