Few not a bit fixes