Thanks for pointing both of these things out @bricker. Both of these issues are fixed in 66a75b736cc7e107cbee5c5e4a5c20cff954354a