Fix warnings
Minor conf cleanup