Fixed warning and wordings