fixes and backward compat