US, CA bug fixes