Minor changes to both PHP and C#