More enhancements after testing on ubuntu