small set of fixes