Refine setup for Ubuntu