Some updates to 1.0.6 13751