Fixes for Ubuntu kickstart