More updates for 4.0.3