Fixed globals in respect to composer classloading

Change-Id: Iecec97b0e100b401ff08a0f57ff54887bfa6f2c6