Bootstrap upgrade tweaks and language file update