Fixed more  warnings