Minor fixes

This just fixes a few minor problems I noticed.