Auto-wanted, few minor fixes/improvements