Updates necessary for update to fc18