Stuff - small changes

fix #1410
fix #1381
fix #851