Fixes to align better with previous code.