More updates to catch up to 1.2.10