Bugfixes in syntax and bucket support