cleaned up 2 warnings