Here and there fixes/reviews