Topic/stabilise build 1

Fixes for #144, #146, #150 #152, as per commits below.