Fixes on deployment