Fixed issues with vector lib