Changed some types & added setup improvements

Change-Id: I82d01cf9424df7318b950b40676abc34ca4c0a54