matrix: properly handle lazy vector wrapping creation
iterator: fix compilation issues