little changes to fix warnings