[FIX] Post-merge fixes