modifications to eliminate compilation errors