Fixes for the current versions