Fixes for fcppt