very small changes, warnings fixed