And here are some fixes.