More syntan fixes