changes to fix warnings from old compiler