0.16.04 (Nivve) small fixes