Last-time fixes