various late night fixes