Consolidation to fix bugs