fix: Solve issues with edit matrix permissions screen
fix: Use return value rather than pass-by-reference