more bug fixes (quick ones)