Fixing issues from the branch