Fixed some variable to facilitate deployment