[#842] Fixes after review