Static Field & FindBug report related fixes