Fixes for synthesis.