Friday night fixes