Fixed some notices and auto-collection