Fixed problems discovered in review