A little bit of fixes