Fixes for 1.2.5.