fixes for Ubuntu