Fixes against live