more fixes for potential bugs particularly in other locales