A couple of fixes

Here you go. Enjoy.