Making some small fixes.