Small updates

Here is couple small updates that can be useful.