small changes to fix compilation errors