Fixes by hpl.