Bug fixes. End of day check-in.