Fixes for recent compiler changes.
Fixes compilation with 0.9.4 hopefully.
Fixes compilation on 0.9.4.