Fixed a few InvalidCastException with Common.Update