EULA fixes