I added the fixes below, any change to get them in? Thanks.