Tweaks to plainchildform, ostools and admin tools