[master] just some small tweeks.