2.1.2 Many small fixes