Fixe bugs from staging