Fixing remaining compiler issues ...