Fixing issues as I build lamson from source.

(Any review most welcome.)