Fix @FatalEagle complaints