FIxes for helping deploy