Apply changes, as per review comments