Random fixes from staging