Thanks @ckarlof ! Made 2 issues from your comments and we will fix those up.