little bit fixes