1039: Coupla bug fixes.