[#307] Fixes after review