Updates for fcppt
Changes for fcppt