few small fixes :P