Cleaned up patch series for 1.0.5
