use newer maintenance target and fix script crash
changes from review