Various syntatic fixes