fixes as reported by Palindine