Add: minor improvements or fixings to unix support;