Fixed bugs related to yaclml syntax