Fixes for newer rust version