Fixes to make it compile again.