Fixes matrix, instance, func errors