Some cleanup/fixes on the top-level