Still working on vector warnings