fixed compilation errors
merged to fix compilation errors