Build 2014310: Minor bugfixes