bit of fixes