Fix problems of login vs non login bash shells