Minor changes regarding deployment