Mainly eol convention updates