mostly beneficial fixes
forgot these