A few useful fixes.