[#feature/warning-matrices] Fixes some warnings and improves minor stuffs