Various hotfixes for 1.0.2