Fix classloader ordering