Update to fix 2 small bugs as mentioned by @somatonic in the forums.