Development changes

Fix another "free" matrix -> vector conversion