Fixes according to review comments