Fixes for Ubuntu