updates to clear some warnings