Fix/global property init

n/t