fix some minor transition issues and warnings