Fixing minified builds

Change-Id: Ic4974b09d59eb60165bbb627619517a9d17ffac0