Correct issues from master dev