fixed compilation errors after initial commit