Minor matrix tidy ups