first small fixes