A lot of small fixes again