small code changes to make sure we're up to date