drop stable5 fixes