Fixes around classloading and static CREATOR