Fixes and tabs refactoring.