Fix last commits