Fixes for fcppt and sge