Fixes after fitst release attempt failed