I'll fix those two issue in the evening. Here's a new ticket: #460 for the comment above.