Required fix, cleanup