late night bug fixes