Fix issues with ubuntu/dash