Fixed compile errors after upgrading to 1.4.0 beta