stable5 fixes