Fixed simple issues