Fix couple silly bugs!