A few late night fixes.