fixed few issues from Nat