a bit of fixes