Implements minor changes