Fix staging dirs; cosmetics