Fix bugs found on deploy application