Both fixed with commit 47592657d7fa24cca77f47fcddbf35bf0de0485c