Fixes from cold review