Resolve minor issues from last commits