Fixes for 1.8.