Remove 2 warnings