Fixes from deployment