Fixed minor isses