Misc fixes and string table updates