Others fixes