Couple of small fixes, and spaces to tabs..