Minor conf/messages tweaking