Additional fixes according to comments.