Minor changes for laptop consumption