Fixed a few minor bugs encountered in the New York testing.