fix 4 last commits