Small bug fixes

Yay! Due Thursday!