More gradle changes. Fixed a couple of NPE
Version 1.2 Release