Some changes to better support the laptop