Fixes to brush texture handling