Review: Various fixes