Fixed a couple bugs that slipped through