Commit 743048f1e9d9c853ffac80093a4814a1ac7d9c62

Ben Straub 2013-04-19T10:29:50

Fix some minor issues