[PATCH 0/2] moveconfig fixes