Fixes according to comments