Few compilational fixes.