Better android compilation
Laptop changes