Slight adjustments to make it build.