Fixes for new texture stuff