Fixes from live