Many fixes related to the v101 milestone