Resolver/syntax fixes