Bug fixes for SnowFlake 2015