Let's try thse fixes out.