Changes for fcppt