Fixed warnings in propgaurd