Add club and heavy club; Fix compile error