[#7] Bunch of small fixes