Minor code style change
Minor theadFixed tweaks