Fixes according to review