2 important fixes