Two fixes for the last update, sorry for frequent update!

There were a couple of issues related to the last update. Normally, I would have checked it really good before uploading, but I was kind of doing it by proxy. This should hopefully do it!