Using bash instead of sh (ubuntu), minor additional changes