some fixes from community wishliost