Small syntax and interface improvements