Minor bug fixes.
Fixed my fail commit