Address minor coverity defects, uninitialised variables. Tidy headers and fix compilation after. Tagging @okovanda @sroygara as original authors.