Small bug fixes...