Small several changes