Get changes from dalerank - small fixes