WIP: Working on fixing global properties.

Change-Id: I577d7d12a4a02a550535dc963759d68e827964ff