Fix indexing
Reinstate kPa on NetScanner
Fix includes for desktop UI