Dang. Thanks, I will take a look at those bugs!
As of right now, both these bugs should be fixed. Thanks again for pointing them out! :)