Fix nits from Vivien's review (compiler, context, locale, bindings)