Minor adjustments.
Preparation for 64-bit solvers.