Fixed minor changes