Fixed issues from pull