Fixes issues according to reviews.