fix smaller issues