fixed small define errors