Fix improper use of WARN_UNLESS and minor changes
Fix improper use of WARN_UNLESS and minor changes

tacketar/lstore,tacketar/lstore,accre/lstore,tacketar/lstore,accre/lstore,accre/lstore,tacketar/lstore,accre/lstore