Couple fixes to match intended output