LA: Builder tweaks #139