Fix issue with not loading ~/.bashrc
Misc fixes