compilation errors fixed (for now)