Little bit of fixes...