More compilatino fixes.