Topic/deploy fixes

Minor deploy fixes