Merge "Fix bad references in preloaded-classes"