Miscellaneous fixes

* Analysis fixes. 
* Removes unnecessary array declaration.