[Laptop] Misc. minor changes