Fixes from deployment box