Fixed pull-request problems