Fix some autoremove bugs - should close #1093