Applied small fixes.