Couple Fix-ups and WIPs