Fix last changes