Bug fixes for number of nights