Fixes for this version