More changes to compile with the bigLib