fixed minor compilation warnings; removed buddy system merging error