Final tiny modifications