DenseMap and style fixes