Some more updates to 1.7.10