Card #122
fix all compilation errors