Refactor info allocator / fix warnings