Fixed Matrix struct errors