@goodfeli can you confirm that both changes in this file are fine?