Fix some synthesis errors