Fix build problems on fc18