More laptop fixes