Add in fixes in K2 SVN to April 4th