Misc style bug updates
Updates to various