Soem small fixes