Updated to correct errors reported by client