Sintatic fixes