Log Message: Fix problems in previous commit which I missed because I didn't use the right package to test them.