Minor bug fixes before closing time