Resolving assorted compilation errors.